Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

qboot: 20150603 -> 20170330, fix build #47364

Merged
merged 1 commit into from
Sep 25, 2018
Merged

qboot: 20150603 -> 20170330, fix build #47364

merged 1 commit into from
Sep 25, 2018

Conversation

xeji
Copy link
Contributor

@xeji xeji commented Sep 25, 2018

Motivation for this change

ZHF #45960. Didn't build.
Switch back to original upstream repo which is more recent than the fork we used. Bump and fix build.

Things done
  • built in a sandbox on NixOS
  • firmware boots a kernel in qemu

(listed maintainer: tstrobel, no github account given)

Switch back to original upstream project which is more recent
than the fork we used.
@GrahamcOfBorg GrahamcOfBorg added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 labels Sep 25, 2018
@GrahamcOfBorg
Copy link

No attempt on x86_64-darwin (full log)

The following builds were skipped because they don't evaluate on x86_64-darwin: qboot

Partial log (click to expand)

Cannot nix-instantiate `qboot' because:
error: assertion failed at /private/var/lib/ofborg/builds/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/grahamc-ndnd/pkgs/top-level/stage.nix:150:21

@GrahamcOfBorg
Copy link

Unexpected error: command failed with exit code 1 on aarch64-linux (full log)

Attempted: qboot

Partial log (click to expand)

copying path '/nix/store/8ynpiyjjkwr81f6qgkn0k0sk375hms2c-curl-7.61.0' from 'https://cache.nixos.org'...
copying path '/nix/store/bb9pkri5j5vj4hhxvn2w8xrwpgw8vr8s-libssh2-1.8.0-dev' from 'https://cache.nixos.org'...
copying path '/nix/store/gqr2fmwh6dwsd6x9vgbpg198b1ry0jg7-stdenv-linux' from 'https://cache.nixos.org'...
copying path '/nix/store/0s6ssahw5igfzwm5xvp669agb975yn4y-nghttp2-1.32.0-dev' from 'https://cache.nixos.org'...
copying path '/nix/store/919xbryjwccvhdw1rf7z44bzia42ymqp-gcc-7.3.0' from 'https://cache.nixos.org'...
copying path '/nix/store/377dz41jqqksp1k0hk91z2wwb0rnxdrv-curl-7.61.0-bin' from 'https://cache.nixos.org'...
copying path '/nix/store/z8fnr48vw5k75001wnhnssvay9dsshsz-openssl-1.0.2p-bin' from 'https://cache.nixos.org'...
copying path '/nix/store/w4z78cp8zg4lkb7gk2ny8vvxr87znnbm-openssl-1.0.2p-dev' from 'https://cache.nixos.org'...
copying path '/nix/store/ikz9cqqlfxmydw5xv618afvb53kv5pi1-curl-7.61.0-dev' from 'https://cache.nixos.org'...
error: a 'i686-linux' is required to build '/nix/store/ziyvp8f8f8jaclpr7p78fb4fg0s76isy-source.drv', but I am a 'aarch64-linux'

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: qboot

Partial log (click to expand)

installing
post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/0cibgwfva6x0dhxs86fjx6fy7l686kvl-qboot-20170330
shrinking /nix/store/0cibgwfva6x0dhxs86fjx6fy7l686kvl-qboot-20170330/bios.bin.elf
cannot find section .dynamic
strip is /nix/store/12dfjp75wyikscm4p3vlnn74ai8n5fcf-binutils-2.30/bin/strip
patching script interpreter paths in /nix/store/0cibgwfva6x0dhxs86fjx6fy7l686kvl-qboot-20170330
checking for references to /build in /nix/store/0cibgwfva6x0dhxs86fjx6fy7l686kvl-qboot-20170330...
cannot find section .dynamic
/nix/store/0cibgwfva6x0dhxs86fjx6fy7l686kvl-qboot-20170330

@xeji xeji merged commit 4ad424f into NixOS:master Sep 25, 2018
@xeji xeji deleted the p/qboot branch September 25, 2018 20:32
xeji added a commit that referenced this pull request Sep 25, 2018
Switch back to original upstream project which is more recent
than the fork we used.

(cherry picked from commit 4ad424f)
@xeji
Copy link
Contributor Author

xeji commented Sep 25, 2018

backport: 391bf82

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants